Merge branch 'master' into scenarios
Andrew Cantino
2 geänderte Dateien mit 3 neuen Zeilen und 3 gelöschten Zeilen
+ 1
- 1
app/assets/javascripts/application.js.coffee.erb
@@ -130,7 +130,7 @@ $(document).ready -> |
||
| 130 | 130 |
|
| 131 | 131 |
if tab = window.location.href.match(/tab=(\w+)\b/i)?[1] |
| 132 | 132 |
if tab in ["details", "logs"] |
| 133 |
- $(".agent-show .nav-tabs li a[href='##{tab}']").click()
|
|
| 133 |
+ $(".agent-show .nav-pills li a[href='##{tab}']").click()
|
|
| 134 | 134 |
|
| 135 | 135 |
# Editing Agents |
| 136 | 136 |
$("#agent_source_ids").on "change", showEventDescriptions
|
+ 2
- 2
app/helpers/application_helper.rb
@@ -9,11 +9,11 @@ module ApplicationHelper |
||
| 9 | 9 |
|
| 10 | 10 |
def working(agent) |
| 11 | 11 |
if agent.disabled? |
| 12 |
- link_to '<span class="label label-warning">Disabled</span>'.html_safe, agent_path(agent) |
|
| 12 |
+ link_to 'Disabled', agent_path(agent), :class => 'label label-warning' |
|
| 13 | 13 |
elsif agent.working? |
| 14 | 14 |
'<span class="label label-success">Yes</span>'.html_safe |
| 15 | 15 |
else |
| 16 |
- link_to '<span class="label label-danger">No</span>'.html_safe, agent_path(agent, :tab => (agent.recent_error_logs? ? 'logs' : 'details')) |
|
| 16 |
+ link_to 'No', agent_path(agent, :tab => (agent.recent_error_logs? ? 'logs' : 'details')), :class => 'label label-danger' |
|
| 17 | 17 |
end |
| 18 | 18 |
end |
| 19 | 19 |
end |